Cleaned code format