Cleaned out boiler plate