Major cleanup, fixed blank line issue and tilde lits