Code clean up (prepare for release! :+1: )