Fixed stylistitic stuff

MERGE!!!