Formatting and redundant prototypes removed