Removed redundant Maybe completely

Edited function names for clarity as well.