Removed useless function
Added prototypes in header file and cleaned up a bit