Clean code & finish handling orientation