Cleanup: changed return codes to bools