Cleaned up format and line indentation