Fixed some code readibility issues