Cleaned up brackets and echo statements