Added return value, removed useless crud