improved and cleaned up some writings in methods