some cleaning up, added bootstrap