Code cleanup ^^