Changed format and styles slightly to prepare for documentation