cleanup and added minifier