Fixed leak and refactored decls in header
No more errors but bools as return
Hide those funcs