Organized some code, added option reading