Updated comments and code styling (like #pragma mark -)