Removed some enters and format