Improved class layout