Cleaned code
No hash tags needed