Cleaned up the boostrap script