Cleaned up initial boilerplate