Just move code for better organization