cleaned up code margin inconsistencies