Code cleanup

Made by Marvin