Cleanup i merge koda