fixed some costmetic code