Cleaned up file manager
Code cleaup of file manager