cleanup and added bootstrap