added FS and cleaned up main file