boostrap conflict fix & code cleaning