Cleanup

slot naming and class location canges