Cleaning up + aliassing classes