removing redundant selfs
removing redundant curly braces