Fixed indentation, cleaned code