worked on arguments list for function/subroutines; cleaned up code a little bit