Cleaned up code, decorated site