BadAss Insertion and some cleanup :)