Cleaned up existing solutions to fit new template