Cleaned up code and removed redundant qualifiers