Adding proper licensing + cleanup