Cleaned up changes and shit, should be rather consise