Little cleanup and try for baby (lol jk)