updated style + removed shitty stuff