Changed the return value to make more sense
Removed non-engine related stuff